Skip to content

use appbundler and habitat scan fixes#1951

Merged
neha-p6 merged 1 commit into
mainfrom
sanjain/CHEF-35089/use-appbundler
Jun 3, 2026
Merged

use appbundler and habitat scan fixes#1951
neha-p6 merged 1 commit into
mainfrom
sanjain/CHEF-35089/use-appbundler

Conversation

@sanjain-progress
Copy link
Copy Markdown
Contributor

@sanjain-progress sanjain-progress commented Jun 1, 2026

Summary

This pull request improves the packaging and installation process for ohai in Habitat environments. The main changes include switching to appbundler for binstub generation, cleaning up vendored gems to avoid CVE false positives, and simplifying the Habitat install script.

Changes Made

  • Updated .expeditor/buildkite/artifact.habitat.test.ps1 to simplify Habitat installation flow and remove extra debug output.
  • Refactored habitat/plan.sh to use appbundler-generated binstubs, runtime wrapper, and cleanup hooks.
  • Updated habitat/plan.ps1 to remove vendored .github directories to reduce scanner false positives.
  • Generalized lockfile cleanup in cleanup_lint_roller.rb.
  • Added binstub_patch.rb to preserve runtime gem path behavior for binstubs.

Mirror chef/chef-cli#341 changes in Ohai (excluding dependency updates).

- Simplify Habitat install script usage in Buildkite artifact test

- Update habitat plans to use appbundler-generated binstubs and runtime wrapper

- Remove vendored .github directories to reduce scanner false positives

- Generalize lockfile cleanup and add binstub patch helper

Signed-off-by: Sachin Jain <Sachin.jain@chef.io>
@sanjain-progress sanjain-progress requested review from a team and jaymzh as code owners June 1, 2026 12:37
@sanjain-progress sanjain-progress changed the title fix: use appbundler and habitat scan fixes use appbundler and habitat scan fixes Jun 1, 2026
@neha-p6 neha-p6 merged commit 3eefbe2 into main Jun 3, 2026
55 checks passed
@neha-p6 neha-p6 deleted the sanjain/CHEF-35089/use-appbundler branch June 3, 2026 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants